Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 10 Apr 2007 09:30:48 +0000 (10:30 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 10 Apr 2007 09:30:48 +0000 (10:30 +0100)

Trivial merge